added position names, reworked queries