Use startsWith instead of find
Fix restrictions