Search modified

Search has been modified as per the new conditions. The constraints have been removed and everything has been moved to classes.
I asked you to compare CLIENT_FIELD_CHOICES and CLIENT_ORDER_CHOICES because CLIENT_FIELD_CHOICES was in right format. But I can see that you have broke the right format.