add form and generalize selector name