improvements for the search limitation functionality