bug fix for no results + allow to show max results