Adding limit to search
Moving service to query args