Update category menu structure to limit queries