fixed variable handling
Merge branch 'develop' of https://github.com/vemedio/poodle into develop

Conflicts:
	frontend/search.php