alpha release with working query :)