improved complex action queries involving components