fix PHP error
custom sort services only if enabled
removed test comments
final check complete