Refactory search criteria into search package