fixed all fishmark queries