Fixed token expiration bug by removing jsql queries. Instead expired tokens or approved sites are filtered at the repository level