CRM-13684 fix

This bug was introduced by https://github.com/pratik-joshi/civicrm-core/commit/eabdd55eec7a373c8015e87276c9d47622ac4194 commit (indirectly by PR https://github.com/civicrm/civicrm-core/pull/1290), in which we require some modification and don't require some of them, so after investigation made the appropriate changes. 

----------------------------------------
* CRM-13684: Profile Search using
  http://issues.civicrm.org/jira/browse/CRM-13684