Minor changes.. keeping code up to date and refinement of join
query parameters for better performance