Started refactor to user sunspot query
Fixed some syntax errors in new sunspot block