Fixed getitem and allow search to include kwargs