include extension when sorting
fix issue with forms