Improve users searches on plans