Changed for allowing again form search