Improved query to return full set, but duplicates exist
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	helper.php
Refactoring, consolidating error checking, general code improvements