begin 0.26-SNAPSHOT
remove optionals from plugin queries; refactor and consolidate
release 0.26