fix param order
more efficient search