click actions enhancements and packing variable fix