Add limit argument
Use table view controller because of buggy search controller