DEV: Add Onlysquare for condition in rows