Fixed route queries and another small Issues