improved search fields