Adding support for single form or no downloadable forms