Add message for notFound api method
Fix entitySelector again