Server fixes
join query for debugging