Client screen search fixed