Adds Org search 404 handling. Closes #16