Refactor find options parsing/defaulting
Refactor endpoint checking / shortform