v1.1 - Added No Results functionality