Split up entity-label autocomplete filter into pure-id and combined label-id versions.