Fixed issue #653: Fixed search field class