feat(pick): add aliases + fix omit