Topic/inline form fixes