Added search macros for clarity and ease

Also updated an API method…not that that’s a huge deal or anything.