SITRACK-95 - Make it work for show_criteria as well