#169 Fixed issues with query/beacon/visualizations