was bug, but fixing that made query alot slower
merge
merge