Add autocomplete and pagination