simplify api paths & lookup logic