fixes for find endpoint