Combine entry masks by logical AND rather than replace

It is hardcoded to AND for now, as this is the same as train selections are combined. In the future, OR may also be desireable via some form of global configuration.