Fix #3

Remove macros.
Reorder routes.
Fixes selection to select.