Implemented pre-filtering of results using new filter method;
Added check for this.has_data at start of udpate call