switch to using database-backed lookup