CARE #44: Added support for computed fields in query builder