Fixed minor bug with form selector