Fixed bug with changing search fields