added find-user macro, fixed join tables