Fixed organ bugs, limit 500 results, better searching