Fixed search filter. Other small changes