Refactored custom SQL query implementation.
Fix custom component property mapping issue