select from correct table would be nice