Removed complex query and made much much much better :-)