Fixing search with aliased fields