Changed to manually look up ids in search